Auto merge of #1360 - alexcrichton:new-io, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 27 Feb 2015 23:53:09 +0000 (23:53 +0000)
committerbors <bors@rust-lang.org>
Fri, 27 Feb 2015 23:53:09 +0000 (23:53 +0000)
commita58ffd7191ec4067e770232b43cc711abd1d3e6b
tree9aa8da10dc5fee76a6d778dc41721e4a07e1ae0a
parent57730649d2593879a37becf8a535246014cac1ef
parenta6dad62221350701340081cdcaea6a663b6a552e
Auto merge of #1360 - alexcrichton:new-io, r=alexcrichton

cc @aturon, this is one giant commit.